From 7d4066de41209b26759dac6f6ac214a633bcd992 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 2 Dec 2014 16:25:18 +0100 Subject: [PATCH] mir: add a NANO_TO_MILLI conversion macro --- gdk/mir/gdkmireventsource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c index a02adffc54..701f394be2 100644 --- a/gdk/mir/gdkmireventsource.c +++ b/gdk/mir/gdkmireventsource.c @@ -22,6 +22,8 @@ #include "gdkmir.h" #include "gdkmir-private.h" +#define NANO_TO_MILLI(x) (x / 1000000) + struct _GdkMirWindowReference { GdkMirEventSource *source; GdkWindow *window; @@ -273,7 +275,7 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event) event->key_code, event->scan_code, is_modifier, - event->event_time / 1000000); + NANO_TO_MILLI (event->event_time)); break; default: //case mir_key_action_multiple: @@ -301,7 +303,7 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event) y = event->pointer_coordinates[0].y; } modifier_state = get_modifier_state (event->modifiers, event->button_state); - event_time = event->event_time / 1000000; + event_time = NANO_TO_MILLI (event->event_time); /* The Mir events generate hover-exits even while inside the window so counteract this by always generating an enter notify on all other events */ -- 2.30.2